Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fix some shenanigans involving interaction order with wound tending #1067

Merged
merged 1 commit into from
Dec 12, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25551
Original PR: tgstation/tgstation#80225

About The Pull Request

Fixes #80223 . See issue for information about the bug.

This PR fixes it by placing wound tending before parent call but after surgery.

It also fixes it by rewriting a little bit of medical stack item code to only block interaction chain when actually healing someone - This is not necessary with the above fix, but it futureproofs things.

Changelog

🆑 Melbert
fix: When using an item on a mob, you will always attempt to fix wounds AFTER surgery, BUT BEFORE the item's own interactions. As an example, this means using a mesh on a mob will attempt to progress surgery first, then attempt to fix any burn wounds, then heal burn damage.
/:cl:

…tending [MDB IGNORE] (#25551)

* Fix some shenanigans involving interaction order with wound tending (#80225)

## About The Pull Request

Fixes #80223 . See issue for information about the bug.

This PR fixes it by placing wound tending before parent call but after
surgery.

It also fixes it by rewriting a little bit of medical stack item code to
only block interaction chain when actually healing someone - This is not
necessary with the above fix, but it futureproofs things.

## Changelog

:cl: Melbert
fix: When using an item on a mob, you will always attempt to fix wounds
AFTER surgery, BUT BEFORE the item's own interactions. As an example,
this means using a mesh on a mob will attempt to progress surgery first,
then attempt to fix any burn wounds, then heal burn damage.
/:cl:

* Fix some shenanigans involving interaction order with wound tending

---------

Co-authored-by: MrMelbert <[email protected]>
@Iajret Iajret merged commit 7da1312 into master Dec 12, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25551 branch December 12, 2023 22:38
AnywayFarus added a commit that referenced this pull request Dec 12, 2023
Iajret pushed a commit that referenced this pull request Feb 24, 2024
…or players to make thatch floors + Bonus fixes to primitive storage structures (#1067)

* Adds thatch as a result of drying grass, usable to make thatch patches

* Fixes a few bugs with what drops from primitive storage structures + decapitalizes their names

* weapon -> item_to_check

* Addresses more review comments

* Fixes it being able to move things you shouldn't be able to move with shelves
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants